Merge changes from Mr-Dave Master #29
Conversation
config.h is auto generated upon configure, motion.mk808.conf was temporary experimental config from test branch - it's not needed in the scope of current fork
CHANGELOG INSTALL ffmpeg.c ffmpeg.h netcam.c netcam_rtsp.c
Remove some files that should not be in source tree, minor changes
Conflicts: configure netcam.c netcam_rtsp.c
Unstable
Merge with latest "unstable" tree of Mr-Dave
Whitespace fix for better merge with upstream
|
I also vote for this pull. Tested it a lot, have been running stable for long time |
|
Congratulations on shipping this massive amount of work, but |
|
All changes were not properly attributed. |
|
No need to close this pull request and lose all the comments, you can force-push over the existing pull request (your master branch), and this request will update automatically. |
|
About the rebase: I was noting that this pull request integrated a number of other pull requests without merging them in properly. Although the codebase gets the improvements, it removes the attribution, commit messages, and history associated with those pulls. It also obscures which pull requests are dependent on each other, making it it harder for the maintainer to decide on an individual basis which to apply, and in which order. I suggested a few methods to resolve this in the comments of Issue #20. Best thing, I think, would be for the maintainer to merge the issues one by one in order of dependence. I have no strong feelings about this, my point was to make a housekeeping comment. It was not my intention to get my work removed from Mr-Dave's tree, but rather to have it merged properly. I applaud the massive work Mr-Dave has done (and, importantly, shipped), so feel free on my part to reopen this pull request as it was. |
|
Aklomp indicated that my fork and associated merge did not provide Dave On 9/8/2014 2:13 AM, tosiara wrote:
|
This is obviously a massive pull. Various bugs and associated fixes were implemented throughout the development process of my fork and illustrated in the changes below. It may be easier to review the end result rather than the step by step evolution. As far as I can determine, this pull would resolve all the outstanding rtsp issues listed in your fork.